Advent of `tests/ui` (misc cleanups and improvements) [4/N] #140036

jieyouxu · 2025-04-19T09:39:13Z

Some tests/ui/ housekeeping, to trim down number of tests directly under tests/ui/. Part of #133895.

Review advice

Best reviewed commit-by-commit.
I can squash commits before merge, commits are separate to make it easier to review.

rustbot · 2025-04-19T09:39:18Z

rustbot has assigned @BoxyUwU.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

jieyouxu · 2025-04-19T09:42:46Z

tests/ui/inference/auto-instantiate.rs

+pub fn main() {
+    println!("{}", f(Triple {x: 3, y: 4, z: 5}, 4).a.x);
+    println!("{}", f(5, 6).a);
+}


Discussion: this test is also kinda exercising a bunch of things tho -- e.g. I think it also exercises {integer} -> isize coercion. That return Pair { a: x, b: y }; can also be materially different from Pair { a: x, b: y } in terms of which HIR typeck path we take. lmw if u have a better wording for the intention of this test.

jieyouxu · 2025-04-19T10:31:01Z

@rustbot author

rustbot · 2025-04-19T10:31:05Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

jieyouxu · 2025-04-19T10:40:35Z

tests/ui/target-cpu/explicit-target-cpu.rs

+//! Check that certain target *requires* the user to specify a target CPU via `-C target-cpu`.
+
+//@ revisions: amdgcn_nocpu amdgcn_cpu
+
+//@[amdgcn_nocpu] compile-flags: --target=amdgcn-amd-amdhsa
+//@[amdgcn_nocpu] needs-llvm-components: amdgpu
+//@[amdgcn_nocpu] build-fail
+
+//@[amdgcn_cpu] compile-flags: --target=amdgcn-amd-amdhsa
+//@[amdgcn_cpu] needs-llvm-components: amdgpu
+//@[amdgcn_cpu] compile-flags: -Ctarget-cpu=gfx900
+//@[amdgcn_cpu] build-pass
+
+//@ revisions: avr_nocpu avr_cpu
+//@[avr_nocpu] compile-flags: --target=avr-none
+//@[avr_nocpu] needs-llvm-components: avr
+//@[avr_nocpu] build-fail
+
+//@[avr_cpu] compile-flags: --target=avr-none
+//@[avr_cpu] needs-llvm-components: avr
+//@[avr_cpu] compile-flags: -Ctarget-cpu=atmega328p
+//@[avr_cpu] build-pass


Review remark: I thought amdgcn-amd-amdhsa was the only target that did this, but apparently avr-none also requires -C target-cpu being set, but I couldn't find a dedicated test for it, so I added avr* revisions here.

For avr-none, cf. #131651 and #137830.

- Reworked the test as a *centralized* version of checking that certain targets correctly require `-C target-cpu` being specified. - Document test intention. - Move `amdgpu-require-explicit-cpu.rs` under new dir `tests/ui/target-cpu/` - No other ui subdir really fits this "requires `-Ctarget-cpu`" check.

- `tests/ui/augmented-assignment-feature-gate-cross.rs`: - This was *originally* to feature-gate overloaded OpAssign cross-crate, but now let's keep it as a smoke test. - Renamed as `augmented-assignment-cross-crate.rs`. - Relocated under `tests/ui/binop/`. - `tests/ui/augmented-assignments.rs`: - Documented test intent. - Moved under `tests/ui/borrowck/`. - `tests/ui/augmented-assignment-rpass.rs`: - Renamed to drop the `-rpass` suffix, since this was leftover from when `run-pass` test suite was a thing. - Moved under `tests/ui/binop/`.

- Reformat the test. - Document test intention. - Move test under `tests/ui/inference/`.

jieyouxu · 2025-04-19T10:42:47Z

@rustbot ready

compiler-errors · 2025-04-20T15:41:24Z

r? compiler-errors @bors r+ rollup

bors · 2025-04-20T15:41:28Z

📌 Commit b47fe51 has been approved by compiler-errors

It is now in the queue for this repository.

…errors Advent of `tests/ui` (misc cleanups and improvements) [4/N] Some `tests/ui/` housekeeping, to trim down number of tests directly under `tests/ui/`. Part of rust-lang#133895. ### Review advice - Best reviewed commit-by-commit. - I can squash commits before merge, commits are separate to make it easier to review.

Rollup of 11 pull requests Successful merges: - rust-lang#139795 (Clarify why SGX code specifies linkage/symbol names for certain statics) - rust-lang#139946 (fix missing word in comment) - rust-lang#139982 (SystemTime doc tweaks) - rust-lang#140009 (docs(LocalKey<T>): clarify that T's Drop shouldn't panic) - rust-lang#140021 (Don't ICE on pending obligations from deep normalization in a loop) - rust-lang#140036 (Advent of `tests/ui` (misc cleanups and improvements) [4/N]) - rust-lang#140047 (remove a couple clones) - rust-lang#140052 (Fix error when an intra doc link is trying to resolve an empty associated item) - rust-lang#140074 (rustdoc-json: Improve test for auto-trait impls) - rust-lang#140076 (jsondocck: Require command is at start of line) - rust-lang#140081 (Update `libc` to 0.2.172) r? `@ghost` `@rustbot` modify labels: rollup

…errors Advent of `tests/ui` (misc cleanups and improvements) [4/N] Some `tests/ui/` housekeeping, to trim down number of tests directly under `tests/ui/`. Part of rust-lang#133895. ### Review advice - Best reviewed commit-by-commit. - I can squash commits before merge, commits are separate to make it easier to review.

Rollup of 12 pull requests Successful merges: - rust-lang#134213 (Stabilize `naked_functions`) - rust-lang#139795 (Clarify why SGX code specifies linkage/symbol names for certain statics) - rust-lang#139981 (Don't compute name of associated item if it's an RPITIT) - rust-lang#140036 (Advent of `tests/ui` (misc cleanups and improvements) [4/N]) - rust-lang#140047 (remove a couple clones) - rust-lang#140052 (Fix error when an intra doc link is trying to resolve an empty associated item) - rust-lang#140074 (rustdoc-json: Improve test for auto-trait impls) - rust-lang#140076 (jsondocck: Require command is at start of line) - rust-lang#140077 (Construct OutputType using macro and print [=FILENAME] help info) - rust-lang#140081 (Update `libc` to 0.2.172) - rust-lang#140091 (build_helper: try to rename dir before delete) - rust-lang#140107 (rustc-dev-guide subtree update) r? `@ghost` `@rustbot` modify labels: rollup

…enton Rollup of 11 pull requests Successful merges: - rust-lang#134213 (Stabilize `naked_functions`) - rust-lang#139711 (Hermit: Unify `std::env::args` with Unix) - rust-lang#139795 (Clarify why SGX code specifies linkage/symbol names for certain statics) - rust-lang#140036 (Advent of `tests/ui` (misc cleanups and improvements) [4/N]) - rust-lang#140047 (remove a couple clones) - rust-lang#140052 (Fix error when an intra doc link is trying to resolve an empty associated item) - rust-lang#140074 (rustdoc-json: Improve test for auto-trait impls) - rust-lang#140076 (jsondocck: Require command is at start of line) - rust-lang#140107 (rustc-dev-guide subtree update) - rust-lang#140111 (cleanup redundant pattern instances) - rust-lang#140118 ({B,C}Str: minor cleanup) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#140036 - jieyouxu:ui-cleanup-4, r=compiler-errors Advent of `tests/ui` (misc cleanups and improvements) [4/N] Some `tests/ui/` housekeeping, to trim down number of tests directly under `tests/ui/`. Part of rust-lang#133895. ### Review advice - Best reviewed commit-by-commit. - I can squash commits before merge, commits are separate to make it easier to review.

…enton Rollup of 11 pull requests Successful merges: - rust-lang#134213 (Stabilize `naked_functions`) - rust-lang#139711 (Hermit: Unify `std::env::args` with Unix) - rust-lang#139795 (Clarify why SGX code specifies linkage/symbol names for certain statics) - rust-lang#140036 (Advent of `tests/ui` (misc cleanups and improvements) [4/N]) - rust-lang#140047 (remove a couple clones) - rust-lang#140052 (Fix error when an intra doc link is trying to resolve an empty associated item) - rust-lang#140074 (rustdoc-json: Improve test for auto-trait impls) - rust-lang#140076 (jsondocck: Require command is at start of line) - rust-lang#140107 (rustc-dev-guide subtree update) - rust-lang#140111 (cleanup redundant pattern instances) - rust-lang#140118 ({B,C}Str: minor cleanup) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned BoxyUwU Apr 19, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Apr 19, 2025

jieyouxu commented Apr 19, 2025

View reviewed changes

jieyouxu added the A-testsuite Area: The testsuite used to check the correctness of rustc label Apr 19, 2025

jieyouxu force-pushed the ui-cleanup-4 branch from 401fd58 to 7b8184a Compare April 19, 2025 10:17

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 19, 2025

rustbot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Apr 19, 2025

jieyouxu force-pushed the ui-cleanup-4 branch from 7b8184a to a408bf8 Compare April 19, 2025 10:39

jieyouxu commented Apr 19, 2025

View reviewed changes

jieyouxu added 3 commits April 19, 2025 18:42

tests: adjust tests/ui/auto-instantiate.rs

b47fe51

- Reformat the test. - Document test intention. - Move test under `tests/ui/inference/`.

jieyouxu force-pushed the ui-cleanup-4 branch from a408bf8 to b47fe51 Compare April 19, 2025 10:42

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 19, 2025

jieyouxu mentioned this pull request Apr 19, 2025

Tracking Issue for ui test suite improvements #133895

Open

compiler-errors approved these changes Apr 20, 2025

View reviewed changes

rustbot assigned compiler-errors Apr 20, 2025

rustbot unassigned BoxyUwU Apr 20, 2025

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 20, 2025

jhpratt mentioned this pull request Apr 21, 2025

Rollup of 11 pull requests #140096

Closed

jieyouxu mentioned this pull request Apr 21, 2025

Rollup of 12 pull requests #140112

Closed

ChrisDenton mentioned this pull request Apr 21, 2025

Rollup of 11 pull requests #140127

Merged

bors merged commit 204e9a0 into rust-lang:master Apr 21, 2025
6 checks passed

rustbot added this to the 1.88.0 milestone Apr 21, 2025

jieyouxu deleted the ui-cleanup-4 branch April 22, 2025 05:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Advent of `tests/ui` (misc cleanups and improvements) [4/N] #140036

Advent of `tests/ui` (misc cleanups and improvements) [4/N] #140036

Uh oh!

jieyouxu commented Apr 19, 2025 •

edited

Loading

Uh oh!

rustbot commented Apr 19, 2025

Uh oh!

jieyouxu Apr 19, 2025

Uh oh!

jieyouxu commented Apr 19, 2025

Uh oh!

rustbot commented Apr 19, 2025

Uh oh!

jieyouxu Apr 19, 2025

Uh oh!

jieyouxu commented Apr 19, 2025

Uh oh!

compiler-errors commented Apr 20, 2025

Uh oh!

bors commented Apr 20, 2025

Uh oh!

Uh oh!

Uh oh!

Advent of tests/ui (misc cleanups and improvements) [4/N] #140036

Advent of tests/ui (misc cleanups and improvements) [4/N] #140036

Uh oh!

Conversation

jieyouxu commented Apr 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review advice

Uh oh!

rustbot commented Apr 19, 2025

Uh oh!

jieyouxu Apr 19, 2025

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented Apr 19, 2025

Uh oh!

rustbot commented Apr 19, 2025

Uh oh!

jieyouxu Apr 19, 2025

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented Apr 19, 2025

Uh oh!

compiler-errors commented Apr 20, 2025

Uh oh!

bors commented Apr 20, 2025

Uh oh!

Uh oh!

Uh oh!

Advent of `tests/ui` (misc cleanups and improvements) [4/N] #140036

Advent of `tests/ui` (misc cleanups and improvements) [4/N] #140036

jieyouxu commented Apr 19, 2025 •

edited

Loading